userMenu: Delay restoring presence until the network comes up

Trying to connect to IM servers while offline is pointless, in
particular now that we added a progress indication which makes
the connection attempt very visible.
To fix, wait for the network to become available until restoring
a previous IM presence.

https://bugzilla.gnome.org/show_bug.cgi?id=677982

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index c981e61edb14427fb8cac68588da77599472c0ae..ce4f8ca1a058f3c3c1818e7a5464b5498725afec 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -205,20 +205,19 @@ const IMStatusChooserItem = new Lang.Class({
                                  Lang.bind(this, this._IMAccountsChanged));
         this._accountMgr.prepare_async(null, Lang.bind(this,
             function(mgr) {
-                let [presence, status, msg] = mgr.get_most_available_presence();
-
-                let savedPresence = global.settings.get_int('saved-im-presence');
-
                 this._IMAccountsChanged(mgr);
 
-                if (savedPresence == presence) {
-                    this._IMStatusChanged(mgr, presence, status, msg);
-                } else {
-                    this._setComboboxPresence(savedPresence);
-                    status = this._statusForPresence(savedPresence);
-                    msg = msg ? msg : '';
-                    mgr.set_all_requested_presences(savedPresence, status, msg);
-                }
+                if (this._networkMonitor.network_available)
+                    this._restorePresence();
+                else
+                    this._setComboboxPresence(Tp.ConnectionPresenceType.OFFLINE);
+            }));
+
+        this._networkMonitor = Gio.NetworkMonitor.get_default();
+        this._networkMonitor.connect('network-changed',
+            Lang.bind(this, function(monitor, available) {
+                if (available && !this._imPresenceRestored)
+                    this._restorePresence();
             }));
 
         this._userLoadedId = this._user.connect('notify::is-loaded',
@@ -233,6 +232,21 @@ const IMStatusChooserItem = new Lang.Class({
         }));
     },
 
+    _restorePresence: function() {
+        let [presence, status, msg] = this._accountMgr.get_most_available_presence();
+
+        let savedPresence = global.settings.get_int('saved-im-presence');
+
+        if (savedPresence == presence) {
+            this._IMStatusChanged(this._accountMgr, presence, status, msg);
+        } else {
+            this._setComboboxPresence(savedPresence);
+            status = this._statusForPresence(savedPresence);
+            msg = msg ? msg : '';
+            this._accountMgr.set_all_requested_presences(savedPresence, status, msg);
+        }
+    },
+
     destroy: function() {
         // clean up signal handlers
         if (this._userLoadedId != 0) {